- had different spacing depending if defined from faces or shapes

- reinstates commit f7413b27 from history repository