Revert "Bug 887914 - Unit tests execute all top-level code before any test cases"
Merge pull request #1614 from mozilla/revert-1611-887914v2

Revert "Bug 887914 - Unit tests execute all top-level code before any test cases"