More ES plugin avoidance when told to not use plugins (bug 889764)