Revert "Revert "Revert "Stuck here for tonight"""

This reverts commit 604f3f83756e04d0e97e54d4c920e652140ab257.
Revert "Revert "Revert "Revert "Stuck here for tonight""""

This reverts commit ea98d70e98d90b032a1903c013f4736cce631bfc.
Revert "Merge branch 'master' of https://github.com/wlouthe/491"

This reverts commit 49c2394f37b60d35fa3cf3e5129f7d46305fe231, reversing
changes made to 249e3b1170964c0e125d1bc5ef7f2375a9e76fc8.