Fixes https://app.asana.com/0/11607779860336/19034317410591