Revert "fix merge conflict"

This reverts commit f0864eb568e1cc7025eb94760721484682f33dee, reversing
changes made to a57fd01a37008eb7a6e698f434abb901f4fe3b0c.