un-anonymizing
Merge pull request #475 from agoddard/portland

un-anonymizing