Change this back now that the underlying class exists

Pull to fix was delayed, now accepted.