Revert "#1016890 - a contributed fix for provision-save infinite loop when pulling options from stdin. happens to also fix cluster feature." This reverts commit c214fe6063fdb7e9910b9a053f311c83a550827d.