No need for partial. Fixes #5475