Remove #980 temporary fix