Remove and_call_original method for travis-ci