Hacky fix to catch PR c++/16957 failure