Revert "Storage location configuration options"
Trys to fix reboots some users are having
This reverts commit 8ed330ed6b5b175d881fc47066a50ad2553e7cc0.