Revert "For now use this ;)"

This reverts commit 8401b905ade3dad61390668dc82a18c06684946e.