fix a weirdness causing build problems downstream
fix a weirdness causing build problems downstream

nkhuyu/epic,chen0031/epic,dlwh/epic,followyourheart/epic,maxim-rabinovich/epic,HarishankarSomasundaram/epic,briantopping/epic,langkilde/epic,jovilius/epic,bitemyapp/epic,langkilde/epic