You are describing the near identical steps I've just gone though.
It's a pain to remove the underbelly protection but once that is off it's easy.
This o-ring failed. You could probably just replace or even wrap with Teflon tape and it would fix the problem.