This will allow for better MTT coverage until the problem can be better understood. This commit was SVN r20083.
Meantime, no reason to continue dragging these around. This commit was SVN r18119.
Remains to be tested to ensure everything came over cleanly, so please continue to withhold commits a little longer This commit was SVN r17632.