Feature disabled

Fixes issue #23