Revert "Don't track  for all opens"

This reverts commit af2011b3ec97799c8b2106bf15028d4848c1562b.