Issue #961908 by mikeytown2: Make drupal_attributes() faster