WP-2883: change how space is created.