Revert "Fixes for clang:"

This reverts commit 9abab179e68a909606b8c4c0c678d3b339807168.