Merge "remove offending .pn file to fix build"