Fixes #2539 by checking if extension was specifically supplied as an option.
Merge pull request #2540 from refinery/fix-issue-2539

Fixes #2539 by checking if extension was specifically supplied as an option