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

This reverts commit c4b5fad3e47d8e35d91bac23a815346f714663e6.