Revert "Fix #3989"

This reverts commit e1a94d30e2f30cee36f71c246136fb2db34d25df.
2 files changed