Revert back the same key check as we need it