Revert flood control

(Commits 20f3ce0818d61c18aa1ddf2dddd286fbe685b7b9 and 272372845943b7398c8bed9c751bfce86a482b5b)