Revert "Merge patches from rezor92@googlemail.com:"

This reverts commit 470b3b2f354ef4ca003a8750e5ac0d1974f46606.