Revert include system apps feature, release 2.6