Oh, okay.  Best to do that in a separate commit, if you can, just for clarity.  I wish they'd fix that bug.