Revert "should actually work now :P"

This reverts commit 9e9b3444756eabe56c7cb2621739a156f9eb7c2a.