More reverting

Change-Id: Id208111fcbfc913f33eea109f33e9f5dd9135b28