PCQ Upload with NAT not possible in v6?

In previous versions of routeros you could put a PCQ-upload queue to handle fair upload bandwidth assignment.

In ROS v6 it looks like the queues have moved to postrouting after NAT, this means that you cannot classify by src-address anymore, because you only get the final IP.

Is there a way to do this in v6?