Re-apply fix for EE exclusion.