Spec change I forgot to commit from before.  Broken, but must fix later.