Merge pull request #208 from tschneidereit/sandbox

Sandboxing, part one
Revert accidental, merge-fail-induced, change in commit b4cbf8bf8adb6929b150c472ce3a008decf732ae