Revert "changes by nathan"

This reverts commit c3aae3fcd1e3cc48aee6fcc0e81efc38e8e44018.