Minor patch to allow disabling default location block