Pull from upstream hooligan-solarized again.