Revert "Enable data on/off options"

This reverts commit 363d3f2969f8a407d5079a9b16aa8f4a3c05e0be.