wrigstad review 1
Revert "wrigstad review 1" (added wrong file)

This reverts commit 5e55953fe99b9eafe60957bcaca40532b3b6880b.
tirronen review 1
tirronen review 2