Revert "Update from the original master"

Reverts bazarka/active_merchant#1