Reverted r48983: obsolete since r48989, replaced by less intrusive optimisations.