Revert "Move Future to use a Condition" #344

This reverts commit 083d8d343e07acf6bc7203f818473c1baceef8bc.