Revert "Remove unnecessary sandboxing"

This reverts commit 851b0bec280063c7c43db4e8f06ebb8093941516.
Merge branch 'refs/heads/master' into robots