Revert "Update to latest version"

This reverts commit eedf21247d27e7725e8f7fa6e355d1d9e8977f31.
Revert c218996..e886b81

This rolls back to commit c21899612b8e7f2459f9c24462e13e03f5eb6798.