Revert "Fix some stupid Mainloop.timeout_xxxx log spam issues.  Many more to go."

This reverts commit 6134c440cdc0a0d77ad2f66c0db3f4279735c3af.