Oops. Should also change users of the method.