Oops. Back out a local change I shouldn't have committed in r6184.