Jonathan Cameron <jic23@cam.ac.uk> fix regression from 1836 when the reset_config...