Shamefully, I was the one who introduced the original change for the sake of type safety and I proliferated it to Comingle. I need to remove it there too!