Revert "Not sure. Splunge!"

This reverts commit 81589104c691166197de8e33491642bd57ca4871.