Revert "Merge branch '6.x-1.x' of github.com:victorquinn/uc_stripe into 6.x-1.x"

This reverts commit f4472c6d2f2e03fa67b7d4dfbed2d7367f74d0b2, reversing
changes made to e1d2f7f102e28f4f36eab878464f49d015f4e415.
Revert "Revert "Merge branch '6.x-1.x' of github.com:victorquinn/uc_stripe into 6.x-1.x""

This reverts commit 876f6963fb4c391828063e8b96209fdaeae2e5fc.