Update our cell workaround for the new view hierarchy structure.