Restoring these files for issue #130