Revert r199871 and replace it with a simple check in the debug info