Remove remnants of last commit so trunk builds again.