1420485
patches merged upstream, so pre2 won't need all this Signed-off-by: Jarod Wilson <jarod@redhat.com>