Working out some spec conflicts with core