OMG, this is crap!
Revert "OMG, this is crap!"

This reverts commit ff3d836746438097e58699efd0e54761b7607262.