Revert 8edf6247c087884acd8c873a57c6f414e19091ec

Removes the remaining part of 8edf6247c087884acd8c873a57c6f414e19091ec for a fix i find superior