Remove hackery from #605.