Reverts 1920568057eee522a7e77f523a5ebe322ee43249 (cherry picked from commit 6a5af438ddead33e938eb43265a6fc50c8785022)