Duplicate fix of Kevin Lyles's bug from r7092.