Revert "Local point code changes"

This reverts commit f9314497c4624c30fd0d19cba1a8736afdea2651.