CGIV-1650: Obvious when you see it