Reverted temporary debugging code