Removes need to call enable_thor_actions everwhere