Including the rest of the changes since things broke.  Urgh.