Revert changes from #3405.