Revert "The First and hopefully last first commit"

This reverts commit 0e77ea57fc09f5399f571a1f5dd6b6c98e9ce661.