Revert "fix 1087607: avoid resource conflict among cluster fix and cluster create/resize"

This reverts commit e797ad7b123f70c6bc381f455cd6c044165bf9a7.