Revert all previous changes up to the 409 error modification