Revert "Restore original #wait_interval API"

This reverts commit 18acfe5f8079bef2cc20c775e5668f71a0401619.