Revert "Merge"

This reverts commit dd4f0689992c3b379b45c84922605ef8eb60bee9, reversing
changes made to 5026c8be5af0c1e3d14ed2287441a23dbafbeb58.