Make trunk build once again.