Revert "Update 0.6.1"

This reverts commit 3cf2c1cfaa91f66120f472988177a11fcaf72e43.
Revert "Revert "Update 0.6.1""

This reverts commit 2cb3b7ee0e6e367e4c4624c5784aaeef878b787c.