Backing out changeset 30b100f7edbe (bug 1049551)