this was effectively leaking docker mounts into the state file over time BUG: 468410 (cherry picked from commit a7043760)