Re-adds order ID to PayPal return URL and removes possibility to reset the payment status