We probably don't need to keep the commented out version of this function around.