Once HHH-9451 is fixed an released, we can revert the commits 4693834b4e652667d6a27c41b17047ec698d9b41 and 35d1604299ff002f19a3bfa73d873e9786f97913 done for