Revert "Fix a problem of using an uninitialized parameter" This reverts commit 538af7db Change-Id: I071aa9b7068ef515abb8ae9584df15067706ccb5