Revert last commit.  It makes the test fail.  WTF?