Reverting commit, as it makes at least 10 additional abc tests fail

Revert "Merge commit '76cadf17a3db34aef098256bfa7ecbf97e542b17' into develop"

This reverts commit ffd6c93ee9bf278efe3bdddb5fbddb3f695c154d, reversing
changes made to b916725991ce4a904fdac73cf75799fa0140537b.