... instead of converting attributes.

(cherry picked from commit 62fb96e0)

Change-Id: I3e45c0641389a7b6bdecb5141646aa13ee5c0aa5