Some new code that does this job is being written against 5.1. This code is
largely removed from that work.