Reverting back to ugly path setup that worked