Revert "fix merge conflict"

This reverts commit 5f90d8fd2605e4191364333667aaed522f1b3b8f, reversing
changes made to 55cc9867fe2f3137cdf50e74fa868a8743201c0c.