Revert accidental, merge-fail-induced, change in commit b4cbf8bf8adb6929b150c472ce3a008decf732ae
Merge pull request #209 from tschneidereit/sandbox

Revert accidental, merge-fail-induced, change