This reverts commit 0ec71d87. Reason for revert: fixed now Change-Id: I33d62e910ff6151eb03c814ee7b8984c6f4e5308