Tear out the affine support for now