diff --git a/lib/hawkular/base_client.rb b/lib/hawkular/base_client.rb
index <HASH>..<HASH> 100644
--- a/lib/hawkular/base_client.rb
+++ b/lib/hawkular/base_client.rb
@@ -146,14 +146,9 @@ module Hawkular
     end
 
     def tenant_header
-      if @options[:tenant].nil?
-        { 'Hawkular-Tenant' => 'hawkular' }
-      elsif @options[:tenant].empty?
-        {}
-      else
-        { :'Hawkular-Tenant' => @options[:tenant],
-          'tenantId'         => @options[:tenant] }
-      end
+      headers = {}
+      headers[:'Hawkular-Tenant'] = @options[:tenant] unless @options[:tenant].nil?
+      headers
     end
 
     def handle_fault(f)
If the tenant is not passed in the options no default value is used. (#<I>)