My 839014

This undoes what I did yesterday, updates product details, and also fixes bug 839014.

r?