Revert "merge"

This reverts commit 4f9f9be77d9ac556fb0eef16bd3d2e153356c44f, reversing
changes made to 14e7b1f8115b96a9a08b0c8d2980d562678d0b6e.