Sigh.  Accidental commit reverted.