Revert "Follow int64 = long as plugin generated"

This reverts commit 56424eb497b672a8a3399ff6fa07727ee3521496.