Backed out changeset 118d4c56c3c4 (bug 1031647)