revert files to before Joel's comments