Merge with the offending files removed.
Merge from trunk.