Copying some code back from the 2.1-era Octopress.  Oy.