The code to support it is starting to become increasingly complicated and the number of problem found is a bit alarming. We'll reinclude it later after a bit more testing and hopefully some simplifications.