This reverts commit 105deedf. Reason for revert: Revert with forward fix Change-Id: Ib0b6f6b1cbb011b4c5f2133e1cc15ec76ff29253