e610: revert last commit

Change-Id: I4322af3b15b1cf277a80d9873f88e57e434c5875