Fix build in trunk. This was fixed in 1.4, but blocked in trunk since this hadn...