Merge "Revert "Fix access checks for app compatibility.""