Temporary workaround for #4143