Temporarily revert layer2 during unrelated changes

I'm now working on a subgoal to clean up a few things that will
ultimately fix the current accidental collision of inner rule names.
While doing that, I need to be able to recreate base_grammar.water at
will.