Trying a hint from http://cgit.drupalcode.org/coder/commit/?id=fa8e809