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

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