Backed out changeset 60132db029bd (bug 916134).