Revert "OrderBuilder: Optimize performances a bit by selecting with uid"

This reverts commit acc65d772dd026332ee1281da8caf62855abcdd4.