The changes in commit 55d3b1eb2e have been reverted due to the unavailability of pki-tests. Resolves: #2075154
55d3b1eb2e