Make --with-origin also work without origin :)