Revert "merge"

This reverts commit aa287c9591746dc3a793c9fe06e37fc53b9c46a2, reversing
changes made to e547e9f6966eb2334cd06fb82fa9fcd346013f04.