Merge "Revert the explicit config, see topic"
am: 1914fc65f8

Change-Id: I1fa03443b158cd6d711de2eb4f03b97c33528123