Revert "Merge github.com:Tontsu/viikko3branchi"

This reverts commit 21cb3972c0054249ca57b3f0166042eb2e9e6055, reversing
changes made to 50a8015fcf380bdf5841d74569d6929e82c55004.

s