Sorry, this comment wasn't asking for a change, but rather raising a possible way to handling fail-over, I was fine the way it was for now. I don't think it's worth adding this change in without more effort put in to testing fail-over and recovery of the proposed technique.

Can you please revert the change?