Merge "Revert "Introduce a no-perfprofd module.""