Apply fix for issue #1576664

See more here:
https://drupal.org/comment/8578061#comment-8578061