Because of the "goto" in the "if" body the "else" part is unnecessary and adds another level of indentation. Cleanup the code to not have the "else" part. (cherry picked from commit 9b84bfb5f4)
9b84bfb5f4