Revert "Fix build on clang after previous commit" This reverts commit 9c80cbc87f23040a334e30c750f64523d9ef10c8.