Remove the ZTP speedup hack. Also remove useless debugging code, and a presumably outdated workaround (which was commented out). Fixes issue 6875.
