Remove deviation from upstream