Revert "bug fix #4096"

This reverts commit e72342f10aad4f4f5e9695ce16589f1c9688cae9.
Revert 32b8a06a536d7ff95019296348981549b8ed44c9