Reverted to v3.1.0