For some reason, not all upstream changes were applied.