Comment 1 for bug 1189507

Attaching a sample solution to this bug. I'm sure there is a test that also needs to be modified, but this gets around the problem on my openstack deployment.