What's good for 1.2 isn't good for /trunk. Fix for /trunk coming next...