Yes.  I wanted to let people review the case of it being COSMOS noise first before changing it, since I thought it was an interesting use case.  But I do agree that we should change it to something simpler before merging this branch.