Revert "Fix merge conflict"

This reverts commit 9daaded1041df119cea70869a29af168020a1208, reversing
changes made to d84bf68b474ca53eeb0965897f517b3aa9fcd6be.