Revert "Half the battle"

This reverts commit 2dc7905defabf40beb424a4551ac3d91560babb1.