Backed out changeset 28bce17c7c50 (bug 916126) for OSX xpcshell failures. ba=backout
DONTBUILD