[PATCH] Remove a patch that still touches userspace tools