This change never improved performance (in fact I think it regressed it slightly), so lets revert it and see if things change.