Restored module-level regions and services attributes. GitHub #371