To be discarded
Revert "To be discarded"

This reverts commit bf9859b204d625d3a073f0d094ba529fe641d5aa.
Merge remote-tracking branch 'origin/fixture-class' into fixture-class