Revert "Fixes making compiling possible"

This reverts commit 6be8a147ea63ecc3002748245c98f27a7238ed31.