Revert "1.0.36"

This reverts commit 4ba9009a491ccef3bd59da3303561f36c4fb7ca0.
2.0.1