Reverted optimization that skipped individual handling of point attributes. Closes #2549. Closes #2587.