Revert "rough draft of listener disabler"
Revert "rough draft of listener disabler"

This reverts commit b874812d130188ac5d3d52cb512843a80ac3bead.

edraut/foreign-office,edraut/foreign-office,edraut/foreign-office