Commenting out preserve 3d for aliasing reasons for now.
Merge conflict