This was already meant to be done earlier in cda2fc58.
While at it, extend the permanent TODO with guidance on future feature
gates.