This avoid needlessly overriding things and make cleanup easier. Also simplifies the template a bit.
Change-Id: If3e253a40782e03cde7fc4a91493517ae31fda17