backout Bug 893117 for mochitest failure
merge backout