Merge "Revert the explicit config, see topic"