Revert "Temporary changes to fix crashes during tests."

This reverts commit 1c15e01f6dc57cbd8dbfb45f60c625703309c4a5.

Change-Id: I9ea2f26c9d95b5429c98a0785b1797bea2e3f945
2 files changed