Rejigger some init props that magically appeared during rebase

Change-Id: I1c6cab11207e3b62a80b9e2cce54b70afaaa0db6