Address nearby FIXME using colimit

just removing if statement and adding colimit parameter

Change-Id: Iadf9db7d6cbf40e5703ebed45f7cabc1487724a6
Merge "Address nearby FIXME using colimit"