a1f6ed
Back out patch 1 which conflicts with Dan's patch. Note: I confirmed this change is correct with Dan Berrange.