Revert "Removing code that ... uh ... shouldn't have been there, but was, for a reason I can't fathom."

This reverts commit 92e00b214f9157c2727b8a51c3d60e8c5b5b5810.