Revert "enhancing readability #CXF-5688"
(discussed with Sergey)
This reverts commit 04f0ef2e32f55d51f14cfc6d7a14616b62a6cce5.