This reverts commit 86aae782. A test is failing on "Release" build without assertions enabled (Fedora 31 on x86_64).