Revert "Merge branch 'testing'"

This reverts commit 794a801e60f2a588da01a84f58f318a6095a4280, reversing
changes made to e334e5e0bee394f5ce06145ae9b722946fda4022.