Revert "v1.0 commit"

This reverts commit 9245d21301494d7a1dc229a06b4ac40200c55d82.
v1.0 commit