Revert "MERGE"

This reverts commit c989cc86b2365a3c126657ddb98a19700ec8f182, reversing
changes made to 305680ae4847ecc6715c5b2130f601a0d2f5c60b.