T889: Don't include the common config twice...

Change-Id: I92520c392aca8bd5d999868a4b74398fa3fcde64