(Not that I know if there is any good reason to keep it optional.)

Change-Id: I92c52ad201661755e2d6eb023be7e268249b75a2