rewrite some code after locally committed code going away