Tentatively commit these breaking changes.

Found bug.