Put the variations common configuration into the right place

Otherwise, deprecated logs are legion.