Backed out changeset 7f58c77bb165 (bug 1057186) for xpshell bustage