Created by: eseliger
This reverts commit 40a4d4c24c056dc381ef9264fefb0a18e7adbd03.
Fixed lint errors, CI should tell.