Undoing the dumb "optimization," for real this time