Revert "Revert "Revert "Debugging for failing test"""

This reverts commit df757090bc1238503db4d328e5572a72f1f6d14c.