Backed out changeset fae487ae86fc (bug 937429)