Forgot to remove this TODO item when I made --with-origin the default :)