Remove the hack in the previous commit.