roll back pull request #11 with site-specific stuff