Revert "Merge branch 't/5217b'"

This reverts commit a81e759e3220bc8e6ad30a24d18fc1702f5ff0e6, reversing
changes made to 949b12a6ec804de60dcb12f53a8918ac0015d36b.