Revert "merge"

This reverts commit dfe0a1bc9ec2bb410f4d000e85b20067a0290e0c, reversing
changes made to ecd10503e8b809a96b50d5d5e488d3c78a094c5a.