Fixing inability to turn off data-api