Partially revert 004bf2fb49e3.