DO NOT MERGE Revert "Defer recreation until resumed"

Bug: 171707437
Test: Repro steps in bug

This reverts commit 3f8d868110b426e40e09ece8b305fd84c1dde60c.

Change-Id: I909ab701c674fe975982a7de06dc9e89dcd03aea
2 files changed