Revert debugging hack