This reverts commit a54061ac8f.
The revert causes merge conflicts with further upstream patches. Let's
bring back the missing patch and instead land a forward-fix to be sent
upstream.
Bug: 529733987
Change-Id: I6578709a4ee9e9b62990f80b8cff120549a86c24
Signed-off-by: Carlos Llamas <cmllamas@google.com>