https://bugzilla.redhat.com/show_bug.cgi?id=959641 - make sure we clear the handlers