Revert crisis over, some small changes to checking