Undo too much cleverness.