Revert "Automatic update of defaults"

This reverts commit 09e6c7e7f3caaf58cb366e3d415bd4d92ba04713.

Change-Id: Ieca69f080c20f609f1baf18b5c14cdc0ec8870c0
1 file changed