Revert "Refactor to allow punctuation based on users"

This reverts commit ff09960f5ae5ef79a60257ab7990fe29ad062a45.
We'll use github issues