remove workaround for crashing
Merge remote-tracking branch 'origin/feature/notification' into gh-pages