Revert "Merge branch 'feature-xx'"

This reverts commit b2d96da68e850b65cd638bda4811a84867fb467d, reversing
changes made to 35bc43c6e7053dc1cf10b32ce405bd37653c4f96.