Revert "merge"

This reverts commit f5217b54c951855b840194711f3322b90833729e, reversing
changes made to d8926232135780d69ebd62a977b416cc61cc764c.