Revert "Revert "Revert "Thor"""

This reverts commit 5da09640fbc2406ee3e4071c1f70042219bf0f30.