Revert "merge"

This reverts commit a9c423fa5e0fd13170c31d4eb9829e1a977dcd20, reversing
changes made to 430f507c447846e18737998cb6fc48e8405ade11.