Restore original #wait_interval API