Revert "Fix conf"

This reverts commit 1b06d9ee9e5cd5354d4ce764358933925504ed97.
Revert "Merge branch 'NotifandEmail' into HEAD"

This reverts commit 6ed7318e2322d8088a0f51a97c6e57f6b8272d58, reversing
changes made to cb39380795c975c0d2095c39ffdfebb916445515.
Revert "Merge conflict"

This reverts commit cb39380795c975c0d2095c39ffdfebb916445515.