This reverts commit 552d097f. Reason for revert: Unrelated to the issue Change-Id: I09c8d5e0128b6ff0d0ed484511afc47ab420f90a