Undo mode change in commit c5d0b5226983b5fe3de5c14a73784817ef4687a9