CGIV-4304: This fix better work! See previous commits for reasons