Revert "Fix for failing test"

This reverts commit 06e7d02fb935b37859ee7555f023841ba56b4914.