Merge "Revert "Change to file.managed to pick up changes when the key is modified""