Do not automatically restart after config change

Change-Id: I3268cab4d6367843f02d7a4dd9408c3fc2756395