4584966 removed the last two remnants of eco