Remove hack to work around multiple notification click issues -- and actually resolve
the issue so that the hack isn't necessary