Backout bustage fix from 995146 (because it looks like a freak occurence).