Forgot to run (and fix) unit tests on previous checkin.