Revert previous commit

Test did not compile, byorgey says: I have no idea what happened here.

This reverts commit 9ea71bbdc1008ffce8fef8a836c033c3068717a5.