Restore https://github.com/Juniper/contrail-controller/pull/712