Revert "merge"

This reverts commit e726adbfb335211f4784eed1efa17c1e570b6b5c, reversing
changes made to 505a8d2e4d13c535567e07401086f49d8297f9a1.