Rollout r200426 since it causes PLT regressions.