Restored a couple of files that were accidentally removed.