Revert "Adaptation to TAXIPP changes"

This reverts commit 27fa8899f1f4c6abe135118f4225261910786010.