Fix merge conflict from upstream change