Revert test-failing change from #1114