Revert "Backporting changes to Arpix from other branches"

This reverts commit 0bb4fd28ca506fa6098279638dbcf6c995436869.