Revert "Thanks to cristianomatos"

This reverts commit 7557fb4d158b677c1a2749f377d28f06ec42fc0a.