Partially reverting r31247: