Removing the hacks for now :(