This reverts commit 5cde3c96. The tests were reported failing on clang10
mentioned in commit f706b01a