Revert "fix, because too much code was added to this version, shouldn't have"

This reverts commit 85ec718c61b3fac7d8a678f595b45f5c98463cf6.