Possible cause for #9121 This reverts commit 886b47e713, reversing changes made to 479af3c9e2.
886b47e713
479af3c9e2