Remove a -trunk file that got merged into 3.0 by mistake.