Rolled back some changes for DISTRIBUTEME-22, there was an easy way, solved directly via System property now