Revert "Merge pull request #16610 from gitmai/bug-858017-network-alarm-complete" for network alarm test bustage

This reverts commit 877ddee8e913319780f7e9ccf1770c8af584b976, reversing
changes made to 9422aca1931ba6c68784f9e80bb1b6a7fcfd92e3.