This was created by Hanes, you can see the changes in #53. This should be included in the 2016-site-rewrite branch.
