Restore override (#5128)