revert fix

(cherry picked from commit 4919f336b6827ba2480a6c1f9769a21e077a17a9)