17d81a3611
This reverts commit 5a01f588be.
Reason for revert: We don't want this behavior anymore
Bug: 343882478
Fix: 373319262
Change-Id: I7b16a229cbe303191591ff695f78a2acb831a3e8