Revert "correct merge"

This reverts commit 14633b8d650e67ef39157d4f5e8491b29ef8f257, reversing
changes made to e31d9a05b417e1ecae3aba0aab6cfd6e239f5672.