Revert "Thanks to cristianomatos"

This reverts commit 055010f3f2757bc856ccd2d430a024de9323cac3.