reverted some changes because this was causing the installer to barf