Seems to break 998-redefine-use-after-free in some --no-image configuration. Bug: 65574695 Bug: 69843562 This reverts commit 3417eaef. Change-Id: I2dd157b931c17c791522ea2544c1982ed3519b86