44854ed9d5
This reverts commit 1d12cbcd23.
Reason for revert: bug resolved
Change-Id: Ie5a15594cb3b168c5368f6bd54aab2c6a9d718ae