Bug 942791 - Revert bug 427089. r=mayhemer a=lsblakk