Remove no longer needed YAML workaround