This reverts commit f765bdac. Change-Id: I59294be08998e945eec99c549ac45a70feef0d04 (cherry picked from commit 8b0e2981)