Let's try to update this when we find other broken applications... Reviewed-by: José Fonseca <jfonseca@vmware.com>