Revert "By Teo"

This reverts commit d97779a0d051bc5bb47b9044bd617a24e7951e31.