an option to switch the modes is in the works
(cherry picked from commit 81162e722f2f92e6415d7947416823486992b073)