@esc24 Okay, agreed. 

I'll back this out and default to the current behaviour. Then I'll raise a separate PR to cover the fix in the pyke rules that adheres to the CF convention, thanks to @zak-k.