Re-added the files that someone removed while trying to cleanup stuff.