Revert "fix merge conflict"

This reverts commit 9dc5f7b5258523f108262db936be03d64a92b4d1, reversing
changes made to 1f35271ab429a148015fbbaeb1f9d12eec09a949.