Something doesn't seem right (again). This reverts commit 53ade085. Change-Id: Id5786997ca9dd2a447363e8ac95213ea37468504