Reverting 78cd7e165f16c3249b1732ab73f02eaa18a32b94, bb9849c926dbe59dc087db9d08d0987b78c6f624, 1ff47550efb62daed35847fb6fa77c7bb38e21f9 and 11c227629949325673661034044396572a728ebd due to fixes in HPHP.