That Merge

Turns out that I picked the wrong choice at one of the steps of yesterday's merge and accidentally broke things.

I merged again and appear to have gotten it right this time.

Sheesh.