Restored a part of my fix that was somewhy reverted by Eli in rev. 0d364d4ddd91.

--HG--
branch : product-engine