No need to separate them as they should be together from the begining.
Signed-off-by: NEric Miao <eric.y.miao@gmail.com>