Revert supporting customized sandboxes