Don't check unload queue before ticking things anymore.
Manual merge of faa3058