Revert "Removed listeners since we just need to set the hsmatch value when the"

This reverts commit 59ba36bed7407d920393027da0fc3057f0852320.