Temporarily rolling out r60267, I appear to have hoesed perf at the last minute....