Ticket 47750 - Fix incomplete backport to 1.3.1/1.2.11
Description: An incomplete backport of 47750 to 1.3.1 and 1.2.11 caused
a memory leak.
https://fedorahosted.org/389/ticket/47750
Reviewed by: rmeggins(Thanks!)
(cherry picked from commit 0b5f0d68233cec976d57597d1c810b79c62528a5)
(cherry picked from commit 649e726834820abc0ab6bdfb90806e2dec4391db)