Revert "Temporarily fix failing test"

This reverts commit 3d1fcd0e719877131dad21e96b29afd35726c199.