Moved to using steal-tools