删除一段无效代码。
Merge branch 'dev-3.2.1' into dev-3.1.3