Revert da4b65c..eb23049

This rolls back to commit da4b65ca9097353793c5f5f346e45afb978b5ff8.
Revert eb23049..49cdaeb

This rolls back to commit eb23049e42ab39580e70c2cf7eb14b2ccbfa28d6.
notifications export cleanup