Re-added files that were mysteriously dropped.