Backport install simplification patch from trunk.