Removed an unscalable optimization.