Merge "Add a TODO to remove Ironic related workaround"