Workaround issue described in bcca0ca53a (commitcomment-47338194)
bcca0ca53a (commitcomment-47338194)