This reverts commit 0f32648604ed55566980e78597de3756b1cd5910. This was a wrong commit
All credits to Cotulla