[Flow202] Fix rebasing mistakes in D9984

Summary: Context here. This was the accepted solution in D9984, but I accidentally undid it during rebasing.

Test Plan: Flow

Reviewers: marcin

Reviewed By: marcin

Subscribers: tomek

Differential Revision: https://phab.comm.dev/D10065