Broken backpatching, pre grammar-rewrite commit