Backed out changeset 551f71d3138f (bug 1038243)