Catch up on 2.0-no-bin-compat changes in 2.0