This reverts commit 13aff21f, since the CMake part relanded in c06a8f9c. The GN part is a bit simpler than last time due to the prior simplifications in acea470c.