Revert "Intermediate commit: un-revert last change"

Makes some SmartArt render better, some a bit worse, and some much
worse. Life is hard.

This reverts commit f66d64ab2e85f574a4b9f644ef709ff981483836.

Change-Id: I18b31deea8c14b401134551e74ba7ba208af3ad9