This reverts commit ed2c214ef3 Co-authored-by: cuong-tran <cuongtran.tm@gmail.com> (cherry picked from commit ebfbbf0741c04dc450a943d2cf77f48eed5c6dfa)
ed2c214ef3