Summary: D7340 again

Test Plan: bk

Reviewers: sandyryza, sashank, owen, dgibson

Reviewed By: dgibson

Differential Revision: https://dagster.phacility.com/D7388