Having a doozy of a time merging my changes...

So I'm deleting this file manually.  It's in core now, so it doesn't belong here.