Revert "Revert "Revert "Revert "Thor""""

This reverts commit b919b769eecf13f73cdfbd971f97df0f4be3a65d.