Revert "Optimized product edit query"

This reverts commit 014fd978f61fbec58a2e1c4d29fcd36b575965e2.