Revert "trying to fix tracking of changes"

This reverts commit 3f3225be5b4e7b88f772735eed4401bcc80eef75.
Revert "Revert "trying to fix tracking of changes""

This reverts commit 9df9d6f59329705e35e1617e3a6be3c130d8be9f.
Revert "Revert "Revert "trying to fix tracking of changes"""

This reverts commit 08de2939d505da3cb6bcae084fed45225791b25d.