Revert alert refactor 1 (imported to different branch)
Alert revert 2. Imported to different branch.
Alert revert 3. Imported to minor branch.