Decorator is not necessary with 2.3.x.

I had issues with the checkout process not getting past the payment step with this decorator in place.