Bug 913175 Removing needless code r=dustin