Merge "Don't check synthetic package name on dir removal."