Why did you add these? Is this specific to your environment? If so, can they be removed for the purposes of this PR?