Revert "- Showing annotations during auto mode is now a setting."

This reverts commit 9f55216a4b479643d7e9e9c6335a326c635fd847.

This reverted commit should have gone to the master branch and not to this one.
We are reverting so that we can later rebase with master.