Remove dependency on uitools

It was falling back to being naive anyways