Revert back to 1.0.2, close #1681