Uses mostly Dina Sayed's patch from 2009

Change-Id: Ie7b8decfab6a544ec6f684a50b120bcdcf723e3d
Signed-off-by: Lucas Bullen <lbullen@redhat.com>