Can you rebase off master. These defaults have changed recently.