Revert a9a9c83..cac1e66

This rolls back to commit a9a9c834b7cd048a1312e6697d5e6d7bfe6b4559.
Revert cac1e66..7d28262

This rolls back to commit cac1e66c64f5da481a8dba42ef8011e29025de49.
Deleted alert