Remove singleton
Merge branch 'pluggable_chaos_type' into block_network_chaos_type