Revert the code since ins't tested and it introduce a lot of regressions on the payment system.

Considering this is a PoC, it should be ok.