Yet another try to get origin working