Follow our own Rhine

Change-Id: I30ff5decdba3147a9148a5e9a12fc4f28a807eb2