Revert "Merge branch 'develop' into feature/notifications-redesign"

This reverts commit 7d5c2ecee34a2b9782861b1e9d80496104b14816, reversing
changes made to 44fa269d4444d8a9cc6338dc5a172a774da94e6b.