Revert "Merge remote-tracking branch 'arnoczar/test_chroot' into develop"

This reverts commit c5b5efa71b22337270018d6cd347069de3776512, reversing
changes made to b973453684f41ea34ce74b5adc6946e269149822.