carbon2-commit: Merge by hand with the changeset that backed out e82f5b7010fe.