Reverting r48974. See PR2183 for details.