First cut at non-backwards-compatible 2.0.0-SNAPSHOT