Follow up to Features 2.x commit