Make it optionally disabled so it can pass tests,
closes #1007