Backporting asana change into a non-hookshot environment

See #567