Revert " [1/2] Prepare NotificationManagerService for new format"

This reverts commit 74efbbed8feb2b727c9fb0cae60343da16ddce67.