Rolled back breaking changes. Bugs still exist that need fixing.