Don't check for post_type for product query, and don't force the post_type variable as it should already be set. #4626