Backed out changeset 87f53a100db0 (bug 1043390) for xpshell bustage on ASAN on a CLOSED TREE