Dirty fix for listing products failing.

Change-Id: Icc8da2ed06a9fab6638263d8e648c4482120d2f1