Revert "Merge pull request #842 from runrevali/bugfix-12532"

This reverts commit 3516444dd2f0b0124864367cfd67d70e9f47c8b0, reversing
changes made to eb6ade2f6363345dc5694ee747e4a7e80e8d1957.
[[ Bug 12532 ]] Rehash arrays at more appropriate intervals