Magic to get around a core Drupal problem.
Merge pull request #526 from jordandukart/7.x-FLVC-64

Magic to get around a core Drupal problem.