And add only the minimum amount of operations we are sure about.

Change-Id: I0dd35968206161e31fcd8bfd0b647329c703e0da