This fixes the tests broken by !865 (merged) as mentioned here.
This will create a new commit in order to revert the existing changes.
