Rollback of certain files to ensure compatibility with standard Patmos repo.