Revert "Merge pull request #1040 from willb/FEATURE-ivy-2.3.0-final"

This reverts commit 70b6f2ddb2cb05f8af38cbce0042af26e0e5496f, reversing
changes made to 7fefdb7741aa4e7c475bbe3c535ef452309472cc.

Wrong branch: should have gone on 0.13