closes: #19911 (closed)
related: #19551 (closed) #19910 (closed) #18626 (closed).
This reverts commit 86eea959.
The changed added in the reverted commit aimed to fix a bug ( that is confirmed that is not longer occurring) described at #18626 (closed) which also resulting in the lose of focus described in #19911 (closed).