37109c55aa
This reverts commit ac93fbbb47809108553bd91edf90700679652ca8. Reason for revert: breaks default install path for quickstart Change-Id: I7d513d1bffdfd4293f199c38216ceb00343e06c5