This reverts commit 09ac97fa39. Reason for revert: fixed issue Change-Id: I269fbcedc161ff340eaa17d6a37c18cba7ce0848
09ac97fa39