WP-1892 Reducing the regions to just the top level
WP-1892 Adding back some changes lost in last commit.