See spec change at w3c/webdriver#1861
I had a quick go at implementing this but our code implements the waiting step by queueing tasks, which is incompatible with returning an exception in this way. So leaving it for someone who understands this code better. cc: @trflynn89