Reverting my failed revert (Learning git is fun)

This reverts commit 59cb6ccea62f81e2c31293cb9699ff5b6f7934a5.