Revert "Fix failing unit tests on 1.10.x - TRUNK-4182"

This reverts commit 62d67594b61cc04c7536614101dc8feedeeb08b0.