Not sure about this -- why it was changed, or what it might break in authoring..  TODO: Does authoring work / still look good?