Revert "merged branch mvrhov/patch-1 (PR #4975)"

This reverts commit 407246a1da3b71ca548d00a51d1e5798b69feb8f, reversing
changes made to 3841d1c6d73eb9cc222867ac2bc047d6518d942e.