Backout changeset 8e53d157ab84 (bug 1091796)