Nevermind. See commit message associated with this now.