Revert "AAAARGH!!"

This reverts commit 061c45f09d99bc8e6f14fb86aedf0f46ce6af0af.
Merge branch 'objectives'