diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7e8e20161..531a5263d8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -31,7 +31,7 @@ FIXES
 * \#1259 - fix bug where certain tests that could have a nil pointer in defer
 * \#1052 - Make all now works
 * Retry on HTTP request failure in CLI tests, add option to retry tests in Makefile
-* Fixed bug where chain ID wasn't passed properly in x/bank REST handler
+* Fixed bug where chain ID wasn't passed properly in x/bank REST handler, removed Viper hack from ante handler
 * Fixed bug where `democli account` didn't decode the account data correctly
 * \#1343 - fixed unnecessary parallelism in CI
 * \#1353 - CLI: Show pool shares fractions in human-readable format
diff --git a/x/auth/ante.go b/x/auth/ante.go
index 616ffd2cf2..5bcea123e2 100644
--- a/x/auth/ante.go
+++ b/x/auth/ante.go
@@ -5,7 +5,6 @@ import (
 	"fmt"
 
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	"github.com/spf13/viper"
 )
 
 const (
@@ -72,12 +71,6 @@ func NewAnteHandler(am AccountMapper, fck FeeCollectionKeeper) sdk.AnteHandler {
 			accNums[i] = sigs[i].AccountNumber
 		}
 		fee := stdTx.Fee
-		chainID := ctx.ChainID()
-		// XXX: major hack; need to get ChainID
-		// into the app right away (#565)
-		if chainID == "" {
-			chainID = viper.GetString("chain-id")
-		}
 
 		// Check sig and nonce and collect signer accounts.
 		var signerAccs = make([]Account, len(signerAddrs))