Checking in the cleaner version of the fix for "No Available Products".  This was attached to bug 65311.
Patch by Dave Miller <justdave@syndicomm.com>
r= jake@acutex.net