Issue #735528 follow-up by attiks: Do not backport span -> attr change.
Issue #735528 follow-up by attiks: Do not backport span -> attr change.

joshkoenig/golden-god-demo,brainhell/drupalglass,OccupyWallStreet/streetnet,brainhell/drupalglass,lincgr/Prueba,joshkoenig/golden-god-demo,brainhell/drupalglass,edutrul/social-web,OccupyWallStreet/streetnet,joshkoenig/golden-god-demo,joshkoenig/golden-god-demo,OccupyWallStreet/streetnet,OccupyWallStreet/streetnet,edutrul/social-web,joshkoenig/golden-god-demo,joshkoenig/golden-god-demo,joshkoenig/golden-god-demo,brainhell/drupalglass,lincgr/Prueba,lincgr/Prueba,edutrul/social-web,brainhell/drupalglass,rmcveigh/frontend-dev,rmcveigh/frontend-dev,edutrul/social-web,lincgr/Prueba,edutrul/social-web,rmcveigh/frontend-dev