This reverts commit 4da665d4. Reason for revert: Fix forward Change-Id: Id3aaa354bd712d76995f27daa0beda370824eba3