Revert r216862 due to a performance regression