Remove #and_call_original because it breaks on Ruby 1.8