this commit is possibly game-breaking and should be revoked
oooh aaah, push it real good!