This reverts commit 54de6d6b. Reason for revert: The original bug is fixed Change-Id: I44e2206b2653c72ef00cf6a6c818fe2ec586687f