Revert "Old clang build fix, attempt #2"

This reverts commit 47c9bf155a285abb9bd3094aa08b94835300a760.
Revert "Attempt to fix build on old clang versions"

This reverts commit dea60559120ca13536e795d337aff4cf3a81b652.