Revert back to 1.8.0.0