Reverting r214064 and r215650 while investigating a pesky performance regression