Revert the debugging patches for bug 968200

--HG--
extra : rebase_source : 86523689a0d105fae8ddb2fea426bd02bfdcfe28