Patching back in missing 1.4.0-lists changes.