Remove shovel runtime parameters when we're disabled
Merge bug 24926