Might aswell use the rebased version

Change-Id: I4431323c3ccd37491c190f4a77a4911756c580ad