Partial revert of If5755624 and a comment

Bug: 49066
Change-Id: I97d680b2bfdad02ce2ca94ffc3caf3ad94898e0f
Merge "Partial revert of If5755624 and a comment"