Revert "quick and maybe dirty fix?"

This reverts commit b6add13b0fb167960f0d6e7460a9bf450815bbc6.