_block_until now actually uses the 'timeout' arg

Went to all that trouble to make it easy to customize the timeout, then I didn't use the arg...doh!