Restore compatibility with 1.6.x configuration