Revert "Merge branch 'FeatureTesting'"

This reverts commit fa3643856dab9325fd84e0ad86de125104c44e30, reversing
changes made to 6e6b514d3e6dbfb1008e233d3bb67252d139cb7d.