back off on the repositioning for simple shapes
Merge branch 'master' into generator-assets