Revert "a little modification from Dorimanx"

This reverts commit 6e9bc6d2327aa0c381c3954e0980fd661cb9502d.