Revert behavior from #92