Fix merge conflict from 4299