- Revert 38762 to fix build