(cherry picked from commit 1b10d224c8a68a46ac28d72843fe235ca7ddf630)
Signed-off-by: Austin Seipp <aseipp@pobox.com>