deadlock seems fixed in 2.0 (snapshots post-M2)