This reverts commit d28e9071. Test: manually tested BUG: 33038203 Change-Id: I7a4c6e95a69abb2e40df73509b6e67b93eacf6ff