diff --git a/lib/liquid/template.rb b/lib/liquid/template.rb
index 4b5052c..5755722 100644
--- a/lib/liquid/template.rb
+++ b/lib/liquid/template.rb
@@ -105,7 +105,7 @@ module Liquid
     def parse(source, options = {})
       @options = options
       @profiling = options[:profile]
-      @line_numbers = options.delete(:line_numbers)
+      @line_numbers = options[:line_numbers] || @profiling
       @root = Document.parse(tokenize(source), DEFAULT_OPTIONS.merge(options))
       @warnings = nil
       self
@@ -225,7 +225,7 @@ module Liquid
     end
 
     def calculate_line_numbers(raw_tokens)
-      return raw_tokens unless @line_numbers || @profiling
+      return raw_tokens unless @line_numbers
 
       current_line = 1
       raw_tokens.map do |token|