Backout 7d1746cdf765, bug 1012466 for xpcshell-test failures. a=BUSTAGE
Backout 2af1ca98c935, bug 1012466 for xpcshell-test failures. a=BUSTAGE
Backout 7d1746cdf765, bug 1012466 for xpcshell-test failures. a=BUSTAGE