Revert "Merge remote-tracking branch 'origin/NoT-OnePBFile-Notification'"

This reverts commit 63f4138c91ae26056c9cbb570d7bd8ddb51142ca.