This reverts commit b18f6cc1ce.
b18f6cc1ce
- easier to clean, avoid confusion with 'real' applications, etc.