Use correct feature switch. Closes #1