Reverting my huge pgn.h commit