Reverts r1730873 which itself reverted r1730320 because tests did not pass. But just 4 minutes before my commit (at least I received it 4 mins before) Jinghai fixed the issue at r1730790