Removing hacks that did not work in hhvm