As a workaround for now, don't let GM touch the yy files. I'm reverting them whenever they are touched by GM.
