change back to older config lines

Change-Id: I227d1cc965349f8f816ed1ea002a37985fda399a