Another unported fix... *sigh*

* Attributes is a dict, duh. Ported again from internal POC copy.