Revert to v1.0

This reverts commit 0c98885a2b2575c99882263dfc4bf6aae9079a63.