Oops.  Reverted the wrong commit.

Reverted the previous reversion, which I never meant to do.  Also reverted the footnote test commit, which is what I wanted to revert in the first place.