Removing dependency on old thor.