Revert debug mode fix