https://bugzilla.redhat.com/show_bug.cgi?id=959641 - make sure we clear the handlers
Merge pull request #1295 from andytaylor/2.3.x

https://bugzilla.redhat.com/show_bug.cgi?id=959641