Revert "fix bad merge"

This reverts commit 9f4137edc2dbb58429c2572ed025385e6feabbf1.