Revert changes that broke old CC=>gateway API

This reverts commit 77f1c7e7f9dfd76fe6426fa4face32e5a758f522.

Conflicts:
	Gemfile.lock