Revert "Merge branch 'feature/testing-merge-and-revert'"

This reverts commit ec046ea84bf3b05d447b2e0f5a2c663cb5f5cfb1, reversing
changes made to 9a5a4518d47dc9c65354f85089072218398d4585.

Whoops, I forgot 1 more thing.