ion: revert updates from common

Change-Id: I6cae0eb55ddfc00372a22965dc1ab80a4926754a