Revert "Bug 367982 - Test failures in nightly build"

This reverts commit 67b2ea6074c2a2bc6701e678c843b3adf688fc24.
4 files changed