Revert "pull request from barbariandude"

This reverts commit e445cf88006fd7eb7e533c89eff6ece2c379c550.