I'm reopening this because it's still broken in 6.0.6.9618.