Commit db205463 was incorrectly applied,
and reverted here to re-apply.
Signed-off-by: NEric Miao <eric.y.miao@gmail.com>