temporarily backed out changes that support running with non-admin rights