Instead, just add them to the Style as needed. Includes changes from #8905 and takes care to avoid regressing #3817.