Reverting change I6d2fa445 to fix regression.

Bug: 51399
Change-Id: Ib06ac9439aa85504ef8e2d41de2e16fa1ba5583b