Reverts optimizations as they improve performance only in theory