Reverting f80b59ae28893f86ac6d2dde045396f16c0794a4, c9c6fb310d7108d02b5744a3100848c1111b828d, 2a2d8916053ca8238dceeecfeb2e990ff02c9433 and fb62fa734023435347344b197b10204d9a1fcf6c due to fixes in HPHP.