This is broken agan in 6.0.6.7079!