Added workaround for devstack bug 1236811