Fix broken tests after !1011 (merged) it was merged too fast.
This will create a new commit in order to revert the existing changes.