Revert "No way.... it works..."

This reverts commit 118c79728b4f15afb74e3638ecb46d31081b14bf.