as it's causing build errors with another clang so I'll need to approach this differently. This reverts commit c2827083.