Revert partly the last commit as that didn't work yet