Backout changeset 1ca0267e179 (bug 687140) due to test failure.
Backout changeset 2b19aefb29ea (bug 929903) due to orange.