Removed unnecessary layer of abstraction.
Merge branch 'install-mode'