Forgot to remove a testing hack in the last commit