Revert "Changed over to some different code (test)"

This reverts commit 412036cce965b6087b737deb391cdc4df46b1083.