Revert "For some reason, the class information is not passed in the sample wrapper"

See merge request !37