Revert "For the love of god last commit"

This reverts commit 4541339ed79ca1a9c37e6f280ed438c38d30237c.