Reflect decision from review discussion.
just note that no change is required here given this design - flocker-clone is going to have some responsibilities related to this.