There don't seem to be any behavior-changing changes in this file.  Can we back out the changes here?