See 46bde2f where I'm fixing up this change.