Fix backwards compatibility code to handle an old style public