Backed out changeset 19e59c14b0aa (bug 1049240) for xpshell bustage