Remove dead code added in 8f8640c1373a29f11a58cf19c1e22231b6505a5f