Revert "Merge branch 'release/2.4.0'"

This reverts commit 5575704874c6e793ad0922f8eef3e369940707f0, reversing
changes made to cf0ba08f6fcb9d9d040b4c604dc89fe6f74c19d8.