Removed the .wait_until from the Foundry, as I have never found a place where it's actually useful.