revert accidentally pushed commit and fix test failures introduced by !192 (merged)
This will create a new commit in order to revert the existing changes.
