Summary: The fix for 6940701 broke Zero.
Reviewed-by: twisti
Contributed-by: NGary Benson <gbenson@redhat.com>