Reopened installer-2 since fix isn't yet in repo