Revert "Hey... I did it!"

This reverts commit 5341293f984e7a57035a18e579d37e85f630f20b.