Config changes.

Reviewed in https://codereview.appspot.com/13618045/