Remove unhappy workaround
Support building customized sandboxes
Work around overly cautious failure logic