Bug 966006. r=mcmanus a=abillings