Backout Bug 691177 for suspicion of breaking the build
Merge backout of Bug 691177
Backed out changeset f1b6ee2e822e (Bug 824802) incase it broke the build
Merge backout of bug 824802