This version includes the fix from the removed patch. Signed-off-by: Jeffery To <jeffery.to@gmail.com>