Revert "Some pretty awesome fire/airalarm fixes"

This reverts commit 0056c74db049aa0db90f8f7c9bf1b413c1210d9a.