Temporary fix until #95 is applied to mainline.