Revert earlier ACL behavior changes