Revert "Merge remote-tracking branch 'origin/ft-index/46merge-a'"

This reverts commit b1c1e93dc44b306139fb338c7d07c51330fd4843, reversing
changes made to 60be90af92bb3aeae3e43fe166e8d4381a1e5e7c.