(gimme a sec to git-bisect this)