cb8471b
Ticket 47813 - remove "goto bail" from previous commit https://fedorahosted.org/389/ticket/47813 (cherry picked from commit 4cdd7fd6ad41ff5d92dfd452b6a7bef25462b643)