Remove core duplication in light of recent commits to trunk.