S74292: remove remaining code for a performance feature that was deemed too risky