Revert "fix build"

This reverts commit d1a84ec66029043a399c9196a4f0ffd0b2df585e.
Revert "Allow setting of a custom notifcation on a per contact basis."

This reverts commit df865d0bcd236eccad45ee785fe9e2999e11c27d.