This reverts commit b9eb3f717a017ebe444e3074278788d8e0353147. We fixed the issue by updating the constructors.