Revert r191393 since it caused pr17380.