whoops: revert that accidental commit
gras: well thats a duplicate now
gras: fix stupid multiple type traits error x86 machine