The issue was fixed on master due to the removal of ValuesQuerySet.

Partial forwardport of 7d471fe6 from stable/1.8.x