[native] Address feedback from D14017

Summary: My feedback was not addressed.

Test Plan: I have not tested this. It's ultimately @angelika's responsibility to test her work, and it's unusual that a reviewer would be submitting a diff to address their own feedback

Reviewers: angelika, tomek

Reviewed By: angelika

Subscribers: angelika

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