Reverting a change that really should be in release/2.9