Restore some of the code lost in merge.

I'm really confused by this... I must have screwed up the merge
conflicts. :(