This reverts commit 01cdf8b1. Change-Id: I596855047d78c3c718744ad61432fc45e1239634 (cherry picked from commit 1f158819)