Rollback master branch changes for removeEquivGen/Load implementation