This reverts commit 46c2e1fdb3065542bed96ba944ae4a58465d2b5e. The fix was already landed in 51e917d4.