Bug 461059: Prevent dirt in workspace
2 files changed