Rolling out r17865 because it caused a performance regression.