Bug 903362 - Permission upgrade might fail at removal. r=fabrice, a=leo+