This needs to be patched. Although at this point there might be code depending on this.