It would be great if we could get rid of this method as well now since its only used by tests.