Revert c4e71f7..e5a0739

This rolls back to commit c4e71f7a6e7da2d90ec9a2e099c73f21149bf5ce.
Merge branch 'ringsted' of github.com:bellcom/os2dagsorden into ringsted