Add flags that upstream originally used.