issue #21836: Try another strategy for keeping track of dependencies