Revert "Ticket/12759"
Merge pull request #33 from PayBas/revert-29-ticket/12759

Revert "Ticket/12759"