This has been "fixed" on trunk via check-in [ecf9a72b79755c26].