Reverting another debug hack.