diff --git a/scripts/abci-gen.sh b/scripts/abci-gen.sh
index de42e115f..b1beb7b43 100755
--- a/scripts/abci-gen.sh
+++ b/scripts/abci-gen.sh
@@ -1,18 +1,13 @@
 #!/usr/bin/env bash
 set -euo pipefail
 
-# By default, this script runs against the latest commit to the master branch
-# in the Tendermint spec repository. To use this script with a different version
-# of the spec repository, run it with the $VERS environment variable set to the
-# desired branch name or commit hash from the spec repo.
-
+cp ./proto/intermediate/abci/types.proto ./proto/tendermint/abci/types.proto
+cp ./proto/intermediate/types/types.proto ./proto/tendermint/types/types.proto
 
 MODNAME="$(go list -m)"
 find ./proto/tendermint -name '*.proto' -not -path "./proto/tendermint/abci/types.proto" \
 	-exec sh ./scripts/protopackage.sh {} "$MODNAME" ';'
 
-# For historical compatibility, the abci file needs to get a slightly different import name
-# so that it can be moved into the ./abci/types directory.
 sh ./scripts/protopackage.sh ./proto/tendermint/abci/types.proto $MODNAME "abci/types"
 
 make proto-gen
@@ -23,8 +18,8 @@ echo "proto files have been compiled"
 
 echo "removing copied files"
 
-find proto/tendermint/ -name '*.proto' -not -path "proto/tendermint/abci/types.proto" -not -path "proto/tendermint/types/types.proto" \
+find proto/tendermint/ -name '*.proto' \
 	| xargs -I {} git checkout {}
 
-find proto/tendermint/ -name '*.pb.go' -not -path "proto/tendermint/abci/types.pb.go" -not -path "proto/tendermint/types/types.pb.go" \
+find proto/tendermint/ -name '*.pb.go' \
 	| xargs -I {} git checkout {}