This is even more important as those bits will be moved in future.
Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>