Revert "Removed until I figure out what is wrong with it"

This reverts commit eaea14f256954c0bffbcec5e4e749a6e679c94f1.