Changes that didn't get merged.