Backout Bug 976106, caused bustage. r=kmoir