Revert additional modifications to std lib shutil module

Take advantage of new features.