Partial revert to accomodate not using concat for other OSes