Overlooked this comment - I've not touched this in the current patch, so card still registers these listeners.