v31: don't disable more access checks than necessary