Attached is a patch that reverts the formations fix in order to unbreak 
the delay command. I didn't have time to investigate the details of 
where things were breaking.

Sorry for the inconvenience,
   Eric