Eng 6436 distinct reroute

My mistake -- this HSQL failure is correct.