Fix issues with concierge's self-disable code.