Reverting r55227. This was causing the following failures in the regression