Revert "Remove Product module monkey patch"

This reverts commit 83e885896eeccbe9b24942b24e8840e1f299f3eb.