The return value of this function has changed, this needs to be updated.