Making trunk compile again.