Revert changes from #12672 (#12703)