Revert "Improve key iterations"

This reverts commit bdb6465fd5f5120b240e19fac09b7269fba04e9a.