revert also this, a bit laggish
revert this, there are no improvements, keep the code clean