Yep, the template also belongs to this change :P