Revert "Come on, this is sexy"

This reverts commit 743abc7805460d6c27dba02b0cf2ef4dd77fa73c.