Revert changes of CollectedSampleRepository  issue 155# T:1h