Revert "Performance regression when hot reloading"

This reverts commit c6cf9e3f6cd81b3a1121c056e7af379c5846f9d6.

Reason for revert: unrelated to the bug
Test: atest ActivityRecordTests

Change-Id: Iaa9f06102eabf4399401c73bd126a92549cd7acd
1 file changed