https://github.com/tumblr/collins/pull/131 fixes.