Bug #2771: Fix oneflow recover after a failed scaling