Workaround for #6263, which is related to #4482