Temporarily Add back old way of calcuating normals pending some fixes for next release