Backed out changeset cb8ca90a354d, 894afa1b44ae (bug 1042382)