Reverts ScalaSampleSpec regression