This reverts commit 1c60a631. The fix was done to conciliate 83956d4c and ff56304f but ff56304f was forward-ported erroneously and introduced other issues. opw-702410