Uncomment fix for #4110.