This reverts commit 3957f8af. Reason for revert: The original issue for the workaround has been fixed. Change-Id: I7a641795468d6ba6085611fb0e6d1a4837ee282a