CGIV-1650: Try again