1.3.98-2
[CP Staging] Revert https://github.com/Expensify/App/pull/31201 and https://github.com/Expensify/App/pull/29166 (cherry picked from commit ab4a1489ce0ccb1756525bf454018336365721db)
[CP Staging] Revert https://github.com/Expensify/App/pull/31201 and https://github.com/Expensify/App/pull/29166 (cherry picked from commit ab4a1489ce0ccb1756525bf454018336365721db)