Revert back to v1.0.8