Revert really sucky  commit

This reverts commit c5a08d1d86ac7d58884adaac5318cf9867a7e8af.