Backed out changeset 95e83b0f7cb2 (bug 888986)