Revert "Revert "[64345754]""

This reverts commit c6fcbd23718bacd0cf6f1434a4d075c0c427cad8.