Since (1) half of the disco uses check whether the feature in question
is supported, (2) the other half appears to not absolutely require
disco, and (3) disco needs to be explicitly included/required in order
to be supported, make disco completely optional.

(cherry picked from commit 9a77ddc)