Use system apps, reflect updated API.