Undo premature optimization from change b821d53b