Match changes to isProduct in base package.