Potential fix for trac2533148. The main point of this is to capture work done while debugging.