Partially revert the datasource get_value() code