Revert change that was meant to be only for debug