Revert "Merge pull request #1566 from brandonsavage/respectproduct"

This reverts commit 9b3cccea1ae616b1f933d1cb06a06f10dc5cf567, reversing
changes made to a751244e4c529d622f9ccce25f6c42545c57b2d8.
Merge pull request #1616 from brandonsavage/revertproduct

Revert "Merge pull request #1566 from brandonsavage/respectproduct"