Revert "merger"

This reverts commit 434e5cc54e105c96c2d0519b17db6f4e8a904599, reversing
changes made to 39839ab321d9ac7952c80f648a314b4006783f1e.