Revert fix for location prompt, didn't work...