Revert r22171 (+r22186) for pacbox, given that it doesn't work, and causes crashes...