Regression in __uuidof support: &__uuidof(X) template parameter turns into __uuidof(X)

We are trying to enable -std=?? flags on our build but we are hitting this regression:
https://bugs.llvm.org/show_bug.cgi?id=24986

I am wondering if someone is working on it and if I can help somehow.