Would that work fine with Ubuntu without PFS too? If yes, we could simplify the code a bit.