Reverting debug hack.