Merge "Revert "Handle emergency registration failure case"" into main