Thing is, this does away with the permanence aspect, though it's still better than nothing.
On this, I agree. The answer - which won't be popular, but when has that ever stopped me before

- is to make some spells or rituals not be castable outside of a temple or other safe-at-home surrounding.
So in this case it'd be not only do you need
Greater Restoration to fix this, but it only works if cast in an established temple to the deity of the caster.
Sure, that happens, but in this case I'd find it more relieving than frustrating: the potentially difficult choice of press on or go back is made for us by the fact there's nothing left to do in the field anyway.