Revert "fix issue mentioned in https://spark.desk.com/agent/case/16231"

This reverts commit b0921927e24495b5330d82966a753869fa4b8dd9.