Are you sure nothing else relies on this function?