Re-add the app module to do the backend check
Merge bug25863 again