Fix original order bug introduced by guava refactor