Revert "Merge branch 'testing'"

This reverts commit 61fe5399661bca094b04becee153e293aee903d8, reversing
changes made to 9f5681b6a757a49ae961e4ff7b43a26f58630092.