Merge "Remove two new permission checks"