Undo #23, as Apple reverted changes :-/