Actually enable the debugging code for bug 960760
Automatic merge