Revert "fix conflict"

This reverts commit b06ae4421617a00b1e76679f0fe73ffabf47fa08, reversing
changes made to 8cdb58ae3e0d17dd3579c95d491588e3031c798e.