Revert "Merge"

This reverts commit a6b203a4729c7aee0922dad72ab3cc800a71a083, reversing
changes made to 24815389a40418e19180f9b74d7b34c9283b3436.