Revert "some breaking changes now"

This reverts commit 1331a99dc3ccd77ee305e20efa054554a2a5783c.