undo the changes made for Richard Latham to unbreak test suite.