Partial fix for PR 12859.