Never drop when enabling core apps
Merge branch 'master' of github.com:vanillaforums/vanilla
Revert "Never drop when enabling core apps"

This reverts commit 813914feddfe75523a633cff632fabd6cc12a11a.
Never drop when enabling core apps; more conservative approach