Undo unit test build change to attempt to fix Travis.