Merge "Revert "Temporary changes to fix crashes during tests."" into nyc-dev