Backing out 60330473c522 for Bug 964498 - bustage