Revert "Bug 873498 - Fix tests due to bad rebasing r=schung"

This reverts commit 365475a31ca3e00f863d6fd5fb0b17accd5d98ff.