Revert "update to 1.0, fixed inconsistencies"

This reverts commit 29d7f693251260d0e98c0374b44a606fcb7e938b.