Fix unintentional changes from 458c2a9.
Merge branch '2.0'