Unregister listener, revert getCount() changes