Remove the optimisation of avoiding scavenging for certain objects