Merge "Temporary fix to crash on permissions removal"