Fix #831 by saving/restoring the PD channel mapping