See related comment... this logic has all been removed.