8d9e468dbb
This reverts commit 30bb3a247a.
Reason for revert: Fixed original issue
Change-Id: I02d85d604631795d96f0379eb94b7b6789102ea9