Revert "Re #7944 Convert to point data before saving"

This reverts commit 5ac47ae6fdef79b0e52b79bd571c826229e72a22.