Use defaults that work

Change-Id: Ife4698deaeddfda22078aa382d3d9a5eaffaab3f